Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libnghttp2: Improve CMake handling #26068

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

AbrilRBS
Copy link
Member

While looking into libcurl for #26063 I noticed libnghttp2 was pulling system dependencies.

This turned out to be mostly a false positive, but for some cases, that was still the case.

This PR aims to fix that, and also fix compilation for non-default options

@AbrilRBS AbrilRBS self-assigned this Nov 29, 2024
Comment on lines +83 to +87
tc.cache_variables["LIBEV_FOUND"] = True
tc.cache_variables["LIBCARES_FOUND"] = True
tc.cache_variables["LIBBROTLIENC_FOUND"] = True
tc.cache_variables["LIBBROTLIDEC_FOUND"] = True
tc.cache_variables["LIBXML2_FOUND"] = True
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For testing until I discuss with the team

Comment on lines +94 to +106
# Disable find_package to not scare the user with system libs being picked
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libevent"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libbrotlienc"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libbrotlidec"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2_crypto_quictls"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libnghttp3"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libbpf"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Systemd"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_LibXml2"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libev"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libcares"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libbrotli"] = True # Examples only
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For testing too, ensuring we're not missing any requirements for the lib

tc.cache_variables["JANSSON_FOUND"] = True

# Disable Python finding so we don't build docs
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Python3"] = True
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is NOT for testing and will remain after the PR leaves draft, it avoids cmake from trying to build the documentation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant